From b15628ec80160d4eeadbd5a7c71702cef1249fe4 Mon Sep 17 00:00:00 2001 From: Paul Donald Date: Thu, 11 Dec 2025 00:51:15 +0100 Subject: [PATCH] apk: bump to 3.0.2 We drop patch 0020-apk-fix-compile: integrated at source. Compressed help now functions normally. Signed-off-by: Paul Donald Link: https://github.com/openwrt/openwrt/pull/21127 Signed-off-by: Robert Marko --- package/system/apk/Makefile | 7 +-- .../0020-apk-fix-compile-when-using-C89.patch | 56 ------------------- 2 files changed, 3 insertions(+), 60 deletions(-) delete mode 100644 package/system/apk/patches/0020-apk-fix-compile-when-using-C89.patch diff --git a/package/system/apk/Makefile b/package/system/apk/Makefile index 07ad1d7a32..25a2b0a9a2 100644 --- a/package/system/apk/Makefile +++ b/package/system/apk/Makefile @@ -5,11 +5,10 @@ PKG_RELEASE:=1 PKG_SOURCE_URL=https://gitlab.alpinelinux.org/alpine/apk-tools.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2025-12-03 -PKG_SOURCE_VERSION:=982c9961ad9e71b4068911329c9d8121cedfd9f7 -PKG_MIRROR_HASH:=4fc89e2bbbe10edfaa199b1ca9ace139aa39b43d3de6236e8be8b421d81b334b +PKG_SOURCE_VERSION:=d093f7c198a64bff0cd58afeaf638909fda24ca8 +PKG_MIRROR_HASH:=596dffa2fa019be2755433ed210e30593a6a8708346cf31486d6ad8008e47556 -PKG_VERSION=3.0.1 +PKG_VERSION=3.0.2 PKG_MAINTAINER:=Paul Spooren PKG_LICENSE:=GPL-2.0-only diff --git a/package/system/apk/patches/0020-apk-fix-compile-when-using-C89.patch b/package/system/apk/patches/0020-apk-fix-compile-when-using-C89.patch deleted file mode 100644 index 8cd30542dd..0000000000 --- a/package/system/apk/patches/0020-apk-fix-compile-when-using-C89.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 54385e6dc02ada9ec827b6b79b9359951197fee5 Mon Sep 17 00:00:00 2001 -From: Paul Donald -Date: Tue, 9 Dec 2025 00:31:27 +0100 -Subject: [PATCH] apk: fix compile when using C89 - -The older standard is more strict, and gives rise to errors: - -../src/apk.c: In function 'parse_options': -../src/apk.c:584:4: error: a label can only be part of a statement and a declaration is not a statement - 584 | char *arg = opt_parse_arg(&st); - | ^~~~ - -So move the *arg declaration to function start. - -../src/app_mkpkg.c: In function 'mkpkg_setup_compat': -../src/app_mkpkg.c:423:2: error: label at end of compound statement - 423 | default: - | ^~~~~~~ - -add break; - -Signed-off-by: Paul Donald ---- - src/apk.c | 3 ++- - src/app_mkpkg.c | 1 + - 2 files changed, 3 insertions(+), 1 deletion(-) - ---- a/src/apk.c -+++ b/src/apk.c -@@ -556,6 +556,7 @@ static int parse_options(int argc, char - struct apk_opt_match m; - bool applet_arg_pending = false; - int r; -+ char *arg; - - applet = applet_from_arg0(argv[0]); - if (!applet) { -@@ -581,7 +582,7 @@ static int parse_options(int argc, char - case 0: - break; - case OPT_MATCH_NON_OPTION: -- char *arg = opt_parse_arg(&st); -+ arg = opt_parse_arg(&st); - if (applet_arg_pending && strcmp(arg, applet->name) == 0) - applet_arg_pending = false; - else if (arg[0] || !applet || !applet->remove_empty_arguments) ---- a/src/app_mkpkg.c -+++ b/src/app_mkpkg.c -@@ -421,6 +421,7 @@ static void mkpkg_setup_compat(struct mk - case 0: ctx->compat_rootnode = 1; // fallthrough - case 1: ctx->compat_dirnode = 1; // fallthrough - default: -+ break; - } - } - -- 2.30.2